#include "WPILib.h"
#include "Turret.h"
#include "MA3Encoder.h"
#include "LimitedVictor.h"
#include "Constants.h"
#include <cmath>
#include <cstdlib>
#include <string>

<<<<<<< .mine
Turret::Turret(
=======
Turret::Turret(   
>>>>>>> .r122
	int ballfeedChannel,
	int ballConveyorChannel,
	int flippyBarChannel
)
<<<<<<< .mine
{
=======

{	

>>>>>>> .r122
	ballfeed = new Victor(ballfeedChannel);
	
	conveyor = new Victor(ballConveyorChannel);
	
	flippyBar = new Solenoid(flippyBarChannel);
}

Turret::~Turret()
<<<<<<< .mine
{
=======
{	
>>>>>>> .r122
	delete ballfeed;
}

void Turret::Update()
{
<<<<<<< .mine
		
=======
	return;
>>>>>>> .r122
}

<<<<<<< .mine
=======

>>>>>>> .r122
bool Turret::GetBallfeed()
{
	return ballfeedOn;
}

void Turret::SetBallfeed(float value)
{
	ballfeedOn = (value != 0);
	ballfeed->Set(value);
}

float Turret::GetBallConveyor()
{
	return conveyor->Get();
}

void Turret::SetBallConveyor(float speed)
{
	conveyor->Set(speed);
}

void Turret::SetFlippyBar(bool state)
{
	flippyBar->Set(state);
}

bool Turret::GetFlippyBar()
{
	return flippyBar->Get();
}

<<<<<<< .mine
=======

>>>>>>> .r122
void Turret::Print()
{
<<<<<<< .mine
	
=======
	return;
>>>>>>> .r122
}
